Skip to content

(MAINT) Remove Travis before_install step#6482

Merged
joshcooper merged 1 commit intopuppetlabs:4.10.xfrom
michaeltlombardi:MAINT/master/travis-update
Jan 9, 2018
Merged

(MAINT) Remove Travis before_install step#6482
joshcooper merged 1 commit intopuppetlabs:4.10.xfrom
michaeltlombardi:MAINT/master/travis-update

Conversation

@michaeltlombardi
Copy link
Copy Markdown
Contributor

Prior to this commit the Travis config included a before_install
step which installed bundler at 1.15.4 to resolve an issue with
compatibility in the matrices for Ruby 1.9.3. However, during
research for MODULES-6339 it was discovered that Travis now keeps
their matrices updated with the latest compatible bundler install.

For all of the builds in this matrix Travis is currently using
bundler 1.16.0 and the builds pass successfully.

This maintenance commit removes the pinned-version install of
bundler and instead returns to relying on Travis to build and
maintain images with compatible versions. This also follows the
advice in the comment in the config file on this step.

@puppetcla
Copy link
Copy Markdown

CLA signed by all contributors.

Copy link
Copy Markdown
Contributor

@joshcooper joshcooper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

$ ruby --version
ruby 1.9.3p551 (2014-11-13 revision 48407) [x86_64-linux]
$ rvm --version
rvm 1.29.3 (latest) by Michal Papis, Piotr Kuczynski, Wayne E. Seguin [https://rvm.io]
$ bundle --version
Bundler version 1.16.0
$ gem --version

Also looks like the earlier change was added in https://tickets.puppetlabs.com/browse/PUP-7920 to workaround travis-ci/travis-ci#8357, which is now fixed.

@joshcooper
Copy link
Copy Markdown
Contributor

@Iristyle you were mentioning bundler 1.16.0 issues earlier. Any reason to hold off merging this?

@Iristyle
Copy link
Copy Markdown
Contributor

Iristyle commented Jan 3, 2018

I think we want to target this at 4.10.x branch rather than master, then carry forward.

Technically we could also revert the original commit from @Sharpie, but I care less about that part:
405ab53

Copy link
Copy Markdown
Contributor

@Iristyle Iristyle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets retarget at 4.10.x

Could also reference the info @joshcooper mentioned in commit message about the original ticket / TravisCI issue for the sake of posterity (or just revert original PR).

@Iristyle
Copy link
Copy Markdown
Contributor

Iristyle commented Jan 3, 2018

@michaeltlombardi michaeltlombardi changed the base branch from master to 4.10.x January 3, 2018 17:15
@michaeltlombardi michaeltlombardi changed the base branch from 4.10.x to master January 3, 2018 17:16
@michaeltlombardi
Copy link
Copy Markdown
Contributor Author

Commit message updated to include previous tickets/issues. Working on retargeting.

Prior to this commit the Travis config included a `before_install`
step, added in https://tickets.puppetlabs.com/browse/PUP-7920,
which installed bundler at `1.15.4` to workaround
travis-ci/travis-ci#8357, which is fixed.

We discovered during research for MODULES-6339 that Travis now keeps
their matrices updated with the latest compatible bundler install.

For all of the builds in this matrix Travis is currently using
bundler `1.16.0` and the builds pass successfully.

This maintenance commit removes the pinned-version install of
bundler and instead returns to relying on Travis to build and
maintain images with compatible versions. This also follows the
advice in the comment in the config file on this step.
@michaeltlombardi michaeltlombardi changed the base branch from master to 4.10.x January 3, 2018 17:40
@michaeltlombardi
Copy link
Copy Markdown
Contributor Author

Interestingly, this build is failing on Ruby 2.4.0 but an earlier build from today to the 4.10.x branch doesn't include 2.4.0.

Any thoughts?

@joshcooper
Copy link
Copy Markdown
Contributor

Travis gets confused sometimes when you retarget an earlier branch, as it shouldn't be testing ruby 2.4.0 against the 4.10.x branch (since we didn't add ruby 2.4.0 support until 5.x). I'm going to close the PR and reopen, so it tests the right combinations.

@joshcooper joshcooper closed this Jan 3, 2018
@joshcooper joshcooper reopened this Jan 3, 2018
@michaeltlombardi
Copy link
Copy Markdown
Contributor Author

Thanks, @joshcooper! That makes sense.

@joshcooper
Copy link
Copy Markdown
Contributor

LGTM, @Iristyle want to merge?

@joshcooper joshcooper merged commit fdfb264 into puppetlabs:4.10.x Jan 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants